From e6c5faed739d69acc9e4ed1be6f1c7908ddd72a1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 23 Jul 2013 15:39:56 +0100 Subject: [PATCH] testsuite/a11y: Don't check minimum increment This value is highly sensitive to changes in the theme; we don't want to have to tweak hardcoded integers in this test case every time we rev gnome-themes-standard. Future iterations could do more heuristic matching, but this is enough for now. https://bugzilla.gnome.org/show_bug.cgi?id=704747 --- testsuite/a11y/about.txt | 4 ---- testsuite/a11y/accessibility-dump.c | 16 +++++++--------- testsuite/a11y/colorchooser.txt | 7 ------- testsuite/a11y/entries.txt | 1 - testsuite/a11y/infobar.txt | 2 +- testsuite/a11y/paned.txt | 1 - testsuite/a11y/progress.txt | 1 - testsuite/a11y/range.txt | 2 -- testsuite/a11y/scale-drawvalue.txt | 1 - 9 files changed, 8 insertions(+), 27 deletions(-) diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt index 6e42ed500d..220fa1f317 100644 --- a/testsuite/a11y/about.txt +++ b/testsuite/a11y/about.txt @@ -364,7 +364,6 @@ for details, visit http://www.gnu.org/licenses/gpl.html minimum value: 0.000000 maximum value: 0.000000 current value: 0.000000 - minimum increment: 39.800000 unnamed-GtkRangeAccessible-3 "scroll bar" parent: scrolledwindow1 @@ -377,7 +376,6 @@ for details, visit http://www.gnu.org/licenses/gpl.html minimum value: 0.000000 maximum value: 0.000000 current value: 0.000000 - minimum increment: 14.400000 unnamed-GtkNotebookPageAccessible-4 "page tab" parent: notebook @@ -455,7 +453,6 @@ for details, visit http://www.gnu.org/licenses/gpl.html minimum value: 0.000000 maximum value: 0.000000 current value: 0.000000 - minimum increment: 39.800000 unnamed-GtkRangeAccessible-6 "scroll bar" parent: scrolledwindow2 @@ -468,7 +465,6 @@ for details, visit http://www.gnu.org/licenses/gpl.html minimum value: 0.000000 maximum value: 0.000000 current value: 0.000000 - minimum increment: 14.400000 dialog-action_area1 "filler" parent: dialog-vbox1 diff --git a/testsuite/a11y/accessibility-dump.c b/testsuite/a11y/accessibility-dump.c index 59fd79a521..6fbeb866f5 100644 --- a/testsuite/a11y/accessibility-dump.c +++ b/testsuite/a11y/accessibility-dump.c @@ -257,7 +257,9 @@ dump_text_attributes (GString *string, for (l = attributes; l; l = l->next) { attr = l->data; - /* don't dump values that depend on the environment */ + /* don't dump values that depend on the environment or too + * closely on the exact theme pixels. + */ if (strcmp (attr->name, "family-name") == 0 || strcmp (attr->name, "size") == 0 || strcmp (attr->name, "weight") == 0 || @@ -459,14 +461,10 @@ dump_atk_value (AtkValue *atk_value, g_value_reset (&value); g_value_reset (&svalue); - atk_value_get_minimum_increment (atk_value, &value); - if (g_value_transform (&value, &svalue)) - g_string_append_printf (string, "%*sminimum increment: %s\n", depth, "", g_value_get_string (&svalue)); - else - g_string_append_printf (string, "%*sminimum increment: %s\n", depth, "", G_VALUE_TYPE_NAME (&value)); - - g_value_reset (&value); - g_value_reset (&svalue); + /* Don't dump minimum increment; it changes too much in response to + * theme changes. + * https://bugzilla.gnome.org/show_bug.cgi?id=704747 + */ } static void diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt index aaa9349cde..cd31d4a01b 100644 --- a/testsuite/a11y/colorchooser.txt +++ b/testsuite/a11y/colorchooser.txt @@ -282,7 +282,6 @@ window1 minimum value: 0.000000 maximum value: 255.000000 current value: 255.000000 - minimum increment: 1.000000 Opacity: "label" parent: unnamed-GtkContainerAccessible-11 @@ -381,7 +380,6 @@ window1 minimum value: 0.000000 maximum value: 255.000000 current value: 255.000000 - minimum increment: 1.000000 Blue: "label" parent: unnamed-GtkContainerAccessible-11 @@ -471,7 +469,6 @@ window1 minimum value: 0.000000 maximum value: 255.000000 current value: 255.000000 - minimum increment: 1.000000 Green: "label" parent: unnamed-GtkContainerAccessible-11 @@ -561,7 +558,6 @@ window1 minimum value: 0.000000 maximum value: 255.000000 current value: 255.000000 - minimum increment: 1.000000 Red: "label" parent: unnamed-GtkContainerAccessible-11 @@ -651,7 +647,6 @@ window1 minimum value: 0.000000 maximum value: 100.000000 current value: 100.000000 - minimum increment: 1.000000 Value: "label" parent: unnamed-GtkContainerAccessible-11 @@ -741,7 +736,6 @@ window1 minimum value: 0.000000 maximum value: 100.000000 current value: 0.000000 - minimum increment: 1.000000 Saturation: "label" parent: unnamed-GtkContainerAccessible-11 @@ -831,7 +825,6 @@ window1 minimum value: 0.000000 maximum value: 360.000000 current value: 0.000000 - minimum increment: 1.000000 Hue: "label" parent: unnamed-GtkContainerAccessible-11 diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt index 657a3f3d25..4a3ba24a18 100644 --- a/testsuite/a11y/entries.txt +++ b/testsuite/a11y/entries.txt @@ -327,4 +327,3 @@ window1 minimum value: 0.500000 maximum value: 99.500000 current value: 45.500000 - minimum increment: 0.500000 diff --git a/testsuite/a11y/infobar.txt b/testsuite/a11y/infobar.txt index 0fa016a04d..23db44d0f8 100644 --- a/testsuite/a11y/infobar.txt +++ b/testsuite/a11y/infobar.txt @@ -68,7 +68,7 @@ window1 "filler" parent: bar1 index: 1 - state: enabled sensitive showing vertical visible + state: enabled horizontal sensitive showing visible toolkit: gtk layer: widget diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt index c1eecc73a2..79832c8c63 100644 --- a/testsuite/a11y/paned.txt +++ b/testsuite/a11y/paned.txt @@ -19,7 +19,6 @@ window1 minimum value: 0 maximum value: 0 current value: 0 - minimum increment: 0 label1 "label" parent: paned1 diff --git a/testsuite/a11y/progress.txt b/testsuite/a11y/progress.txt index 186711a6f0..bd87ad3d4d 100644 --- a/testsuite/a11y/progress.txt +++ b/testsuite/a11y/progress.txt @@ -19,4 +19,3 @@ window1 minimum value: 0.000000 maximum value: 1.000000 current value: 0.500000 - minimum increment: 0.000000 diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt index 4a26c5faaf..3bc37da73c 100644 --- a/testsuite/a11y/range.txt +++ b/testsuite/a11y/range.txt @@ -28,7 +28,6 @@ window1 minimum value: 0.500000 maximum value: 99.500000 current value: 45.500000 - minimum increment: 0.500000 scale1 "slider" parent: grid1 @@ -43,4 +42,3 @@ window1 minimum value: 0.500000 maximum value: 99.500000 current value: 45.500000 - minimum increment: 0.500000 diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt index e64b93504c..08666e9d3d 100644 --- a/testsuite/a11y/scale-drawvalue.txt +++ b/testsuite/a11y/scale-drawvalue.txt @@ -20,4 +20,3 @@ window1 minimum value: -100.000000 maximum value: 100.000000 current value: -42.000000 - minimum increment: 1.000000 -- 2.30.2